? 20100430-repositoriesupdate-patch.patch
? config.php
? nbproject
Index: admin/repository.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/repository.php,v
retrieving revision 1.37
diff -r1.37 repository.php
7,13c7,9
< $edit    = optional_param('edit', 0, PARAM_FORMAT);
< $new     = optional_param('new', '', PARAM_FORMAT);
< $hide    = optional_param('hide', '', PARAM_FORMAT);
< $delete  = optional_param('delete', 0, PARAM_FORMAT);
< $sure    = optional_param('sure', '', PARAM_ALPHA);
< $move    = optional_param('move', '', PARAM_ALPHANUM);
< $type    = optional_param('type', '', PARAM_ALPHANUM);
---
> $repository    = optional_param('repos', '', PARAM_FORMAT);
> $action        = optional_param('action', '', PARAM_ALPHA);
> $sure          = optional_param('sure', '', PARAM_ALPHA);
19,21c15,17
< if ($edit) {
<     $pagename = 'repositorysettings' . $edit;
< } else if ($delete) {
---
> if ($action == 'edit') {
>     $pagename = 'repositorysettings' . $repository;
> } else if ($action == 'delete') {
23c19
< } else if ($new) {
---
> } else if (($action == 'newon') || ($action == 'newoff')) {
26a23,34
> // Need to remember this for form
> $formaction = $action;
> 
> // Check what visibility to show the new repository
> if ($action == 'newon') {
>     $action = 'new';
>     $visible = true;
> } else if ($action == 'newoff') {
>     $action = 'new';
>     $visible = false;
> }
> 
37,39c45,47
< if (!empty($edit) || !empty($new)) {
<     if (!empty($edit)) {
<         $repositorytype = repository::get_type_by_typename($edit);
---
> if (($action == 'edit') || ($action == 'new')) {
>     if ($action == 'edit') {
>         $repositorytype = repository::get_type_by_typename($repository);
45,46c53,54
<         $plugin = $new;
<         $typeid = $new;
---
>         $plugin = $repository;
>         $typeid = $repository;
50c58
<     $mform = new repository_type_form('', array('plugin' => $plugin, 'instance' => $repositorytype));
---
>     $mform = new repository_type_form('', array('plugin' => $plugin, 'instance' => $repositorytype, 'action' => $formaction));
55,56c63,64
<     if (!empty($new)) {
<         $adminconfignames = repository::static_function($new, 'get_type_option_names');
---
>     if ($action == 'new') {
>         $adminconfignames = repository::static_function($repository, 'get_type_option_names');
64,67c72,73
<         if (!confirm_sesskey()) {
<             print_error('confirmsesskeybad', '', $baseurl);
<         }
<         if ($edit) {
---
>         require_sesskey();
>         if ($action == 'edit') {
78c84
<              $instanceoptionnames = repository::static_function($edit, 'get_instance_option_names');
---
>              $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
95c101
<             $type = new repository_type($plugin, (array)$fromform);
---
>             $type = new repository_type($plugin, (array)$fromform, $visible);
101,109c107,108
<             $has_instance = repository::static_function($plugin, 'get_instance_option_names');
< 
<             if (!empty($has_instance)) {
<                 // no common setting for this type, so go to setup instances
<                 redirect($sesskeyurl.'&amp;edit='.$plugin);
<             } else {
<                 // configs saved
<                 redirect($baseurl);
<             }
---
>             // configs saved
>             redirect($baseurl);
118,120c117,119
<         if ($edit) {
<             $typeoptionnames = repository::static_function($edit, 'get_type_option_names');
<             $instanceoptionnames = repository::static_function($edit, 'get_instance_option_names');
---
>         if ($action == 'edit') {
>             $typeoptionnames = repository::static_function($repository, 'get_type_option_names');
>             $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
132,134c131,133
<         //display instances list and creation form
<         if ($edit){
<              $instanceoptionnames = repository::static_function($edit, 'get_instance_option_names');
---
>         // Display instances list and creation form
>         if ($action == 'edit'){
>              $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
136c135
<                 repository::display_instances_list(get_context_instance(CONTEXT_SYSTEM), $edit);
---
>                 repository::display_instances_list(get_context_instance(CONTEXT_SYSTEM), $repository);
141c140,150
< } else if (!empty($hide)) {
---
> } else if ($action == 'show') {
>     if (!confirm_sesskey()) {
>         print_error('confirmsesskeybad', '', $baseurl);
>     }
>     $repositorytype = repository::get_type_by_typename($repository);
>     if (empty($repositorytype)) {
>         print_error('invalidplugin', 'repository', '', $repository);
>     }
>     $repositorytype->update_visibility(true);
>     $return = true;
> } else if ($action == 'hide') {
145c154
<     $repositorytype = repository::get_type_by_typename($hide);
---
>     $repositorytype = repository::get_type_by_typename($repository);
147c156
<         print_error('invalidplugin', 'repository', '', $hide);
---
>         print_error('invalidplugin', 'repository', '', $repository);
149c158
<     $repositorytype->switch_and_update_visibility();
---
>     $repositorytype->update_visibility(false);
151,152c160,161
< } else if (!empty($delete)) {
<     $repositorytype = repository::get_type_by_typename($delete);
---
> } else if ($action == 'delete') {
>     $repositorytype = repository::get_type_by_typename($repository);
154c163
<         $PAGE->set_pagetype('admin-repository-' . $delete);
---
>         $PAGE->set_pagetype('admin-repository-' . $repository);
166c175
<         echo $OUTPUT->confirm(get_string('confirmremove', 'repository', $repositorytype->get_readablename()), $sesskeyurl . '&delete=' . $delete . '&sure=yes', $baseurl);
---
>         echo $OUTPUT->confirm(get_string('confirmremove', 'repository', $repositorytype->get_readablename()), $sesskeyurl . '&action=delete&repos=' . $repository . '&sure=yes', $baseurl);
169,172c178,183
< }
< else if (!empty($move) && !empty($type)) {
<     $repositorytype = repository::get_type_by_typename($type);
<     $repositorytype->move_order($move);
---
> } else if ($action == 'moveup') {
>     $repositorytype = repository::get_type_by_typename($repository);
>     $repositorytype->move_order('up');
> } else if ($action == 'movedown') {
>     $repositorytype = repository::get_type_by_typename($repository);
>     $repositorytype->move_order('down');
Index: admin/repositoryinstance.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/repositoryinstance.php,v
retrieving revision 1.18
diff -r1.18 repositoryinstance.php
31c31
< $baseurl    = "$CFG->wwwroot/$CFG->admin/repository.php?session=". sesskey() .'&amp;edit=';
---
> $baseurl    = "$CFG->wwwroot/$CFG->admin/repository.php?session=". sesskey() .'&action=edit&repos=';
56c56
<     $mform = new repository_instance_form('', array('plugin' => $plugin, 'typeid' => $typeid,'instance' => $instance, 'contextid' => $context->id));
---
>     $mform = new repository_instance_form('', array('plugin' => $plugin, 'typeid' => $typeid, 'instance' => $instance, 'contextid' => $context->id));
101d100
<     echo $OUTPUT->header();
113d111
<             echo $OUTPUT->heading($deletedstr);
120a119
>     echo $OUTPUT->header();
Index: admin/settings/plugins.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/settings/plugins.php,v
retrieving revision 1.74
diff -r1.74 plugins.php
236c236
<                         $url . '?edit=' . $repositorytype->get_typename()),
---
>                         $url . '?action=edit&repos=' . $repositorytype->get_typename()),
Index: lang/en/repository.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en/repository.php,v
retrieving revision 1.2
diff -r1.2 repository.php
52,53d51
< $string['clicktohide'] = 'Click here to hide';
< $string['clicktoshow'] = 'Click here to show';
89c87
< $string['hiddenshow'] = 'Hide/Show';
---
> $string['hidden'] = 'Hidden';
100a99
> $string['isactive'] = 'Active?';
116a116
> $string['off'] = 'Off';
118a119
> $string['on'] = 'On';
148d148
< $string['updown'] = 'Display order';
Index: lib/adminlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v
retrieving revision 1.456
diff -r1.456 adminlib.php
1170c1170
<             // do not use defaults if settings not available - upgrdesettings handles the defaults!
---
>                 // do not use defaults if settings not available - upgrade settings handles the defaults!
1481c1481
<             $return .= $OUTPUT->heading('<a name="'.$this->name.'">'.highlightfast($query, $this->visiblename).'</a>', 3, 'main', true);
---
>             $return .= $OUTPUT->heading($this->visiblename, 3, 'main', true);
6083a6084,6092
>      * Helper function that generates a moodle_url object
>      * relevant to the repository
>      */
>     
>     function repository_action_url($repository) {
>         return new moodle_url('/admin/repository.php', array('sesskey'=>sesskey(), 'repos'=>$repository));
>     }
> 
>     /**
6092,6093c6101,6117
<         $output = $OUTPUT->box_start('generalbox');
<         $namestr = get_string('name');
---
> 
>         $actionchoicesforexisting = array(
>             'show' => get_string('on', 'repository'),
>             'hide' => get_string('off', 'repository'),
>             'delete' => get_string('disable')
>         );
> 
>         $actionchoicesfornew = array(
>             'newon' => get_string('on', 'repository'),
>             'newoff' => get_string('off', 'repository'),
>             'delete' => get_string('disable')
>         );
> 
>         $return = '';
>         $return .= $OUTPUT->box_start('generalbox');
> 
>         // Set strings that are used multiple times
6095,6101c6119,6121
<         $updownstr = get_string('updown', 'repository');
<         $hiddenstr = get_string('hiddenshow', 'repository');
<         $deletestr = get_string('delete');
<         $plugins = get_plugin_list('repository');
<         $instances = repository::get_types();
<         $instancesnumber = count($instances);
<         $alreadyplugins = array();
---
>         $disablestr = get_string('disable');
>         
>         // Table to list plug-ins
6103,6104c6123,6124
<         $table->head = array($namestr, $updownstr, $hiddenstr, $deletestr, $settingsstr);
<         $table->align = array('left', 'center', 'center','center','center');
---
>         $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr);
>         $table->align = array('left', 'center', 'center', 'center', 'center');
6106,6132d6125
<         $updowncount=1;
<         foreach ($instances as $i) {
<             $settings = '';
<             //display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
<             $typeoptionnames = repository::static_function($i->get_typename(), 'get_type_option_names');
<             $instanceoptionnames = repository::static_function($i->get_typename(), 'get_instance_option_names');
< 
<             if ( !empty($typeoptionnames) || !empty($instanceoptionnames)) {
< 
<             //calculate number of instances in order to display them for the Moodle administrator
<                 if (!empty($instanceoptionnames)) {
<                     $params = array();
<                     $params['context'] = array(get_system_context());
<                     $params['onlyvisible'] = false;
<                     $params['type'] = $i->get_typename();
<                     $admininstancenumber = count(repository::static_function($i->get_typename(),
<                         'get_instances', $params));
<                     $admininstancenumbertext =   " <br/> ". $admininstancenumber .
<                         " " . get_string('instancesforadmin', 'repository');
<                     $params['context'] = array();
<                     $instancenumber =  count(repository::static_function($i->get_typename(), 'get_instances', $params)) - $admininstancenumber;
<                     $instancenumbertext =  "<br/>" . $instancenumber .
<                         " " . get_string('instancesforothers', 'repository');
<                 } else {
<                     $admininstancenumbertext = "";
<                     $instancenumbertext = "";
<                 }
6134,6138c6127,6156
<                 $settings .= '<a href="' . $this->baseurl . '&amp;edit=' . $i->get_typename() . '">'
<                     . $settingsstr .'</a>' . $admininstancenumbertext . $instancenumbertext . "\n";
<             }
<             $delete = '<a href="' . $this->baseurl . '&amp;delete=' .  $i->get_typename() . '">'
<                 . $deletestr . '</a>' . "\n";
---
>         // Get list of used plug-ins
>         $instances = repository::get_types();
>         if (!empty($instances)) {
>             // Array to store plugins being used
>             $alreadyplugins = array();
>             $totalinstances = count($instances);
>             $updowncount = 1;
>             foreach ($instances as $i) {
>                 $settings = '';
>                 $typename = $i->get_typename();
>                 // Display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
>                 $typeoptionnames = repository::static_function($typename, 'get_type_option_names');
>                 $instanceoptionnames = repository::static_function($typename, 'get_instance_option_names');
> 
>                 if (!empty($typeoptionnames) || !empty($instanceoptionnames)) {
>                     // Calculate number of instances in order to display them for the Moodle administrator
>                     if (!empty($instanceoptionnames)) {
>                         $params = array();
>                         $params['context'] = array(get_system_context());
>                         $params['onlyvisible'] = false;
>                         $params['type'] = $typename;
>                         $admininstancenumber = count(repository::static_function($typename, 'get_instances', $params));
>                         $admininstancenumbertext =   " <br/> ". $admininstancenumber . " " . get_string('instancesforadmin', 'repository');
>                         $params['context'] = array();
>                         $instancenumber =  count(repository::static_function($typename, 'get_instances', $params)) - $admininstancenumber;
>                         $instancenumbertext =  "<br/>" . $instancenumber . " " . get_string('instancesforothers', 'repository');
>                     } else {
>                         $admininstancenumbertext = "";
>                         $instancenumbertext = "";
>                     }
6140,6145c6158,6167
<             $hidetitle = $i->get_visible() ? get_string('clicktohide', 'repository') : get_string('clicktoshow', 'repository');
<             $hiddenshow = ' <a href="' . $this->baseurl . '&amp;hide=' . $i->get_typename() . '">'
<                 .'<img src="' . $OUTPUT->pix_url('i/' . ($i->get_visible() ? 'hide' : 'show')) . '"'
<                 .' alt="' . $hidetitle . '" '
<                 .' title="' . $hidetitle . '" />'
<                 .'</a>' . "\n";
---
>                     $settings .= '<a href="' . $this->baseurl . '&amp;action=edit&amp;repos=' . $typename . '">' . $settingsstr .'</a>' . $admininstancenumbertext . $instancenumbertext . "\n";
>                 }
>                 // Get the current visibility
>                 if ($i->get_visible()) {
>                     $currentaction = 'show';
>                 } else {
>                     $currentaction = 'hide';
>                 }
>  
>                 $select = new single_select($this->repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
6147,6149c6169,6171
<             // display up/down link
<             $updown = '';
<             $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
---
>                 // Display up/down link
>                 $updown = '';
>                 $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
6151,6166c6173,6186
<             if ($updowncount > 1) {
<                 $updown .= "<a href=\"$this->baseurl&amp;move=up&amp;type=".$i->get_typename()."\">";
<                 $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
<             }
<             else {
<                 $updown .= $spacer;
<             }
<             if ($updowncount < count($instances)) {
<                 $updown .= "<a href=\"$this->baseurl&amp;move=down&amp;type=".$i->get_typename()."\">";
<                 $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
<             }
<             else {
<                 $updown .= $spacer;
<             }
< 
<             $updowncount++;
---
>                 if ($updowncount > 1) {
>                     $updown .= "<a href=\"$this->baseurl&amp;action=moveup&amp;repos=".$typename."\">";
>                     $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
>                 }
>                 else {
>                     $updown .= $spacer;
>                 }
>                 if ($updowncount < $totalinstances) {
>                     $updown .= "<a href=\"$this->baseurl&amp;action=movedown&amp;repos=".$typename."\">";
>                     $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
>                 }
>                 else {
>                     $updown .= $spacer;
>                 }
6168c6188
<             $table->data[] = array($i->get_readablename(), $updown, $hiddenshow, $delete, $settings);
---
>                 $updowncount++;
6170,6175c6190
<             //display a grey row if the type is defined as not visible
<             if (!$i->get_visible()) {
<                 $table->rowclasses[] = 'dimmed_text';
<             } else {
<                 $table->rowclasses[] = '';
<             }
---
>                 $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings);
6177,6178c6192,6194
<             if (!in_array($i->get_typename(), $alreadyplugins)) {
<                 $alreadyplugins[] = $i->get_typename();
---
>                 if (!in_array($typename, $alreadyplugins)) {
>                     $alreadyplugins[] = $typename;
>                 }
6181,6192c6197,6206
<         $output .= html_writer::table($table);
<         $instancehtml = '<div><h3>';
<         $instancehtml .= get_string('addplugin', 'repository');
<         $instancehtml .= '</h3><ul>';
<         $addable = 0;
<         foreach ($plugins as $p=>$dir) {
<             if (!in_array($p, $alreadyplugins)) {
<                 $instancehtml .= '<li><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey='
<                     .sesskey().'&amp;new='.$p.'">'.get_string('add', 'repository')
<                     .' "'.get_string('repositoryname', 'repository_'.$p).'" '
<                     .'</a></li>';
<                 $addable++;
---
> 
>         // Get all the plugins that exist on disk
>         $plugins = get_plugin_list('repository');
>         if (!empty($plugins)) {
>             foreach ($plugins as $plugin => $dir) {
>                 // Check that it has not already been listed
>                 if (!in_array($plugin, $alreadyplugins)) {
>                     $select = new single_select($this->repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
>                     $table->data[] = array(get_string('repositoryname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
>                 }
6195,6199d6208
<         $instancehtml .= '</ul>';
<         $instancehtml .= '</div>';
<         if ($addable) {
<             $output .= $instancehtml;
<         }
6201,6202c6210,6212
<         $output .= $OUTPUT->box_end();
<         return highlight($query, $output);
---
>         $return .= html_writer::table($table);
>         $return .= $OUTPUT->box_end();
>         return highlight($query, $return);
Index: repository/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/repository/lib.php,v
retrieving revision 1.238
diff -r1.238 lib.php
380c380,381
<      * 1. Switch the visibility OFF if it's ON, and ON if it's OFF.
---
>      * 1. Change visibility to the value chosen
>      *
384,385c385,390
<     public function switch_and_update_visibility() {
<         $this->_visible = !$this->_visible;
---
>     public function update_visibility($visible = null) {
>         if (is_bool($visible)) {
>             $this->_visible = $visible;
>         } else {
>             $this->_visible = !$this->_visible;
>         }
1066d1070
<         $updown = get_string('updown', 'repository');
1081c1085
<         $table->head = array($namestr, $pluginstr, $deletestr, $settingsstr);
---
>         $table->head = array($namestr, $pluginstr, $settingsstr, $deletestr);
1109c1113
<             $table->data[] = array($i->name, $type->get_readablename(), $delete, $settings);
---
>             $table->data[] = array($i->name, $type->get_readablename(), $settings, $delete);
1732a1737
>     protected $action;
1745a1751
>         $this->action = $this->_customdata['action'];
1749,1754c1755,1762
<         $mform->addElement('hidden', 'edit',  ($this->instance) ? $this->instance->get_typename() : 0);
<         $mform->setType('edit', PARAM_INT);
<         $mform->addElement('hidden', 'new',   $this->plugin);
<         $mform->setType('new', PARAM_FORMAT);
<         $mform->addElement('hidden', 'plugin', $this->plugin);
<         $mform->setType('plugin', PARAM_SAFEDIR);
---
>         $mform->addElement('hidden', 'repos', ($this->instance) ? $this->instance->get_typename() : 0);
>         $mform->setType('repos', PARAM_INT);
>         $mform->addElement('hidden', 'repos', $this->plugin);
>         $mform->setType('repos', PARAM_FORMAT);
>         $mform->addElement('hidden', 'action', $this->action);
>         $mform->setType('action', PARAM_TEXT);
>         $mform->addElement('hidden', 'repos', $this->plugin);
>         $mform->setType('repos', PARAM_SAFEDIR);